From 317bb96f6ce0d67245897e48aa4fb2bd446a3a35 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sun, 16 Feb 2020 00:30:23 -0600 Subject: [PATCH] More thoroughly hide clearly broken code that should exist only on a branch that seeped into master when I added an epmpty file. --- yahoo.cc | 3 ++- yahoo.h | 25 ++++++------------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/yahoo.cc b/yahoo.cc index 780fdd909..72d312621 100644 --- a/yahoo.cc +++ b/yahoo.cc @@ -48,7 +48,8 @@ static xg_tag_mapping gl_map[] = { void YahooFormat::rd_init(const QString& fname) { - xml_init(fname, gl_map, nullptr); +abort(); +// xml_init(fname, gl_map, nullptr); } void diff --git a/yahoo.h b/yahoo.h index 63f0189c5..1dc7fead0 100644 --- a/yahoo.h +++ b/yahoo.h @@ -43,8 +43,11 @@ public: } QVector get_cap() const override { - return FF_CAP_RW_ALL; - //return { (ff_cap) ff_cap_read }; + return { + ff_cap_read, // waypoints + ff_cap_none, // tracks + ff_cap_none // routes + }; } QString get_encode() const override { @@ -76,23 +79,7 @@ private: void wpt_lat(const QString &, const QXmlStreamAttributes *); void wpt_lon(const QString &, const QXmlStreamAttributes *); void wpt_addr(const QString &, const QXmlStreamAttributes *); - xg_tag_mapping gl_map[]; - -#if 0 - static xg_tag_mapping gl_map[] = { - { wpt_s, cb_start, "/ResultSet/Result" }, - { wpt_lat, cb_cdata, "/ResultSet/Result/Latitude" }, - { wpt_lon, cb_cdata, "/ResultSet/Result/Longitude" }, - { wpt_addr, cb_cdata, "/ResultSet/Result/Address" }, - { wpt_addr, cb_cdata, "/ResultSet/Result/City" }, - { wpt_addr, cb_cdata, "/ResultSet/Result/State" }, - { wpt_addr, cb_cdata, "/ResultSet/Result/Zip" }, - { wpt_addr, cb_cdata, "/ResultSet/Result/Country" }, - { wpt_e, cb_end, "/ResultSet/Result" }, - { nullptr, (xg_cb_type)0, nullptr} - }; -#endif - +// xg_tag_mapping gl_map[]; }; -- 2.30.2